bitkeeper revision 1.1041.5.11 (40eacd9fZF8vOabxL_0gJXpgUypPQw)

Fix free_irq() calls to pass the correct dev_id.

diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/common.h b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/common.h
index daf09a76f91543ca326a95039221689accdb52b4..98986cffb8a90a93d01d344acfdb72cc89144a40 100644 (file)
--- a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/common.h
+++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/common.h
@@ -15,11 +15,11 @@
 #include <asm/io.h>
 #include "../blkif.h"
 
-#if 0
+#if 1
 #define ASSERT(_p) \
     if ( !(_p) ) { printk("Assertion '%s' failed, line %d, file %s", #_p , \
     __LINE__, __FILE__); *(int*)0=0; }
-#define DPRINTK(_f, _a...) printk("(file=%s, line=%d) " _f, \
+#define DPRINTK(_f, _a...) printk(KERN_ALERT "(file=%s, line=%d) " _f, \
                            __FILE__ , __LINE__ , ## _a )
 #else
 #define ASSERT(_p) ((void)0)

diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/interface.c b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/interface.c
index 780d793c6c418a8eda6cf9ca265a0b63da8a3458..16b37164ab89199c0c101e279877d0a9d42dd802 100644 (file)
--- a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/interface.c
+++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/interface.c
@@ -217,7 +217,7 @@ int blkif_disconnect(blkif_be_disconnect_t *disconnect, u8 rsp_id)
         blkif->status = DISCONNECTING;
         blkif->disconnect_rspid = rsp_id;
         wmb(); /* Let other CPUs see the status change. */
-        free_irq(blkif->irq, NULL);
+        free_irq(blkif->irq, blkif);
         blkif_deschedule(blkif);
         blkif_put(blkif);
     }

diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/main.c b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/main.c
index fa662496ec876f8c48edc38ab33cac670407eb89..1216600effa18f97bfcdbd0a0efd3718d8329e21 100644 (file)
--- a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/main.c
+++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/main.c
@@ -616,7 +616,7 @@ static void blkif_status_change(blkif_fe_interface_status_changed_t *status)
 
             printk(KERN_INFO "VBD driver recovery in progress\n");
             
-            /* Prevent new requests being issued until we've fixed things up. */
+            /* Prevent new requests being issued until we fix things up. */
             spin_lock_irq(&io_request_lock);
             recovery = 1;
             blkif_state = BLKIF_STATE_DISCONNECTED;

diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/interface.c b/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/interface.c
index 2c4b74e1ea2532e73810af3d0d278c8fcefd6f4f..ff3bc7bbf746a2e5fcbdd627ce5667377ea95a76 100644 (file)
--- a/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/interface.c
+++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/interface.c
@@ -266,7 +266,7 @@ int netif_disconnect(netif_be_disconnect_t *disconnect, u8 rsp_id)
         netif->disconnect_rspid = rsp_id;
         wmb(); /* Let other CPUs see the status change. */
         netif_stop_queue(netif->dev);
-        free_irq(netif->irq, NULL);
+        free_irq(netif->irq, netif);
         netif_deschedule(netif);
         netif_put(netif);
     }